From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 22 Nov 2022 18:40:37 +0000 (+0100)
Subject: extension-tool: Fix falling back to GSettings
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~405^2^2~97
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=007778880ba10127e7872724082458d38e079560;p=gnome-shell.git

extension-tool: Fix falling back to GSettings

When we switched the tool to the public Extensions service, the
fallback to GSettings broke in the case GNOME is installed but
not running (because the service can be autostarted, albeit it'll
fail later).

Fix this by also falling back when we don't get a response from
gnome-shell.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6127

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2552>
---

diff --git a/subprojects/extensions-tool/src/command-disable.c b/subprojects/extensions-tool/src/command-disable.c
index 93c316bf7..bae11b256 100644
--- a/subprojects/extensions-tool/src/command-disable.c
+++ b/subprojects/extensions-tool/src/command-disable.c
@@ -25,6 +25,18 @@
 #include "common.h"
 #include "config.h"
 
+static gboolean
+disable_extension_gsettings (const char *uuid)
+{
+  g_autoptr(GSettings) settings = get_shell_settings ();
+
+  if (settings == NULL)
+    return FALSE;
+
+  return settings_list_remove (settings, "enabled-extensions", uuid) &&
+         settings_list_add (settings, "disabled-extensions", uuid);
+}
+
 static gboolean
 disable_extension_dbus (GDBusProxy *proxy,
                         const char *uuid)
@@ -42,10 +54,7 @@ disable_extension_dbus (GDBusProxy *proxy,
                                      &error);
 
   if (response == NULL)
-    {
-      g_printerr (_("Failed to connect to GNOME Shell\n"));
-      return FALSE;
-    }
+      return disable_extension_gsettings (uuid);
 
   g_variant_get (response, "(b)", &success);
 
@@ -55,18 +64,6 @@ disable_extension_dbus (GDBusProxy *proxy,
   return success;
 }
 
-static gboolean
-disable_extension_gsettings (const char *uuid)
-{
-  g_autoptr(GSettings) settings = get_shell_settings ();
-
-  if (settings == NULL)
-    return FALSE;
-
-  return settings_list_remove (settings, "enabled-extensions", uuid) &&
-         settings_list_add (settings, "disabled-extensions", uuid);
-}
-
 static gboolean
 disable_extension (const char *uuid)
 {
diff --git a/subprojects/extensions-tool/src/command-enable.c b/subprojects/extensions-tool/src/command-enable.c
index 6ae3a8351..712de4a3d 100644
--- a/subprojects/extensions-tool/src/command-enable.c
+++ b/subprojects/extensions-tool/src/command-enable.c
@@ -25,6 +25,18 @@
 #include "common.h"
 #include "config.h"
 
+static gboolean
+enable_extension_gsettings (const char *uuid)
+{
+  g_autoptr(GSettings) settings = get_shell_settings ();
+
+  if (settings == NULL)
+    return FALSE;
+
+  return settings_list_add (settings, "enabled-extensions", uuid) &&
+         settings_list_remove (settings, "disabled-extensions", uuid);
+}
+
 static gboolean
 enable_extension_dbus (GDBusProxy *proxy,
                        const char *uuid)
@@ -42,10 +54,7 @@ enable_extension_dbus (GDBusProxy *proxy,
                                      &error);
 
   if (response == NULL)
-    {
-      g_printerr (_("Failed to connect to GNOME Shell\n"));
-      return FALSE;
-    }
+    return enable_extension_gsettings (uuid);
 
   g_variant_get (response, "(b)", &success);
 
@@ -55,18 +64,6 @@ enable_extension_dbus (GDBusProxy *proxy,
   return success;
 }
 
-static gboolean
-enable_extension_gsettings (const char *uuid)
-{
-  g_autoptr(GSettings) settings = get_shell_settings ();
-
-  if (settings == NULL)
-    return FALSE;
-
-  return settings_list_add (settings, "enabled-extensions", uuid) &&
-         settings_list_remove (settings, "disabled-extensions", uuid);
-}
-
 static gboolean
 enable_extension (const char *uuid)
 {